Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev