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

* commit 'cf5b34b0c43df076cfe8b774c1c919303793fa7c':
  Ensure WallpaperEngine has correct size information