am 7f213d4f: am 4ecb66d0: am 865c35aa: am 7e675645: Merge "Fixed keyguard affordances" into mnc-dev

* commit '7f213d4f7bb056e61f94ae18ef99a6fab7498cbf':
  Fixed keyguard affordances