Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev