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