am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev

* commit '8869d6f3537b323d1c9d1339d057a4866520e649':
  Extend preferred-app preload support for complex resolutions