Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev