Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev