Merge "WM: Consolidate seamless rotation logic"