Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev