Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec' * commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec': Force wallpaper surface to 565.
Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec' * commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec': Force wallpaper surface to 565.