Merge "Lock screen rotation accessibility preference not updated." into jb-dev