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

* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings