Merge "Fix live wallpaper "Grass" display issue"