Merge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev