am 7e675645: Merge "Fixed keyguard affordances" into mnc-dev

* commit '7e675645a9f02ae2273291d31673164177b7be0b':
  Fixed keyguard affordances