Merge "Revert "Use a color container surface to animate rotation with wallpaper"" into main