Merge "Final keyguard tablet layout integration" into jb-mr1-dev