Merge "Integrate new PIN pad." into jb-mr1-lockscreen-dev