Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev