am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for...
am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev
* commit '0505ebbc':
Extend preferred-app preload support for complex resolutions