Merge "Update keyguard layouts on phone" into jb-mr1-dev