Merge "Fix StatusBarWindowController initialization NPE"