Merge "Use fixed-rotation by default for shell transitions"