Merge "Fix password field focus in keyguard" into jb-mr1.1-dev