Merge "Fix NPE in StatusBar" into sc-dev