Merge "Move wallpaper display logic in WallpaperDisplayHelper"