Merge "Fix issue #5508024: Rotation jank seen in live wallpapers" into ics-mr0