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