Merge "Fix wallpaper zoom effect with shell transition"