Merge "Restore wallpaper parallax"