Merge "Hook up fixed-rotation logic to shell transitions"