am f949c8ef: am 3dcd4c89: Merge "Fixed a flash when launching keyguard affordances" into mnc-dev

* commit 'f949c8ef629344452b6d390e4bfa8d7208aa6b50':
  Fixed a flash when launching keyguard affordances