Merge "Make status bar disable() debugging more concise." into oc-dev