Merge "Bring back auto-rotate to settings" into lmp-dev