am b69c77cd: am 1598a508: Merge "Do not back up / restore the rotation-related...
am b69c77cd: am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev
* commit 'b69c77cd':
Do not back up / restore the rotation-related settings