am 5f8d4832: am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user...
am 5f8d4832: am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev
* commit '5f8d4832':
Fix 5608959: Make keyguard follow user setting for orientation