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

* commit '98b9221a903796aab9615526105a51b4386a078c':
  Fix 6535413: Fix overlapping controls in keyguard