Merge "Maintain fixed-rotation illusion for wallpapers in transition" into main