Merge "Fix black keyguard / missing status bar" into mnc-dev