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

* commit 'c7f82cc7fd2b747284da692f73ea7f09b0db9099':
  Fix 6535413: Fix overlapping controls in keyguard