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

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