Merge "Fix unexpected rotation change when re-enabling auto-rotate"