Merge "Fix NPE when status bar isn't available" into oc-dev