Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev