Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev