Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev