Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev