am 448a1f6f: am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev

* commit '448a1f6fed1d16578527500157da4ed3c72f2b90':
  Ensure WallpaperEngine has correct size information