Merge "Fix keyguard layout on tablet" into jb-mr1-dev