am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev

* commit '4d8134c1b9e11c2b3a92195fb753da7b144bad1e':
  Fix black keyguard / missing status bar