Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev