Merge "Status bar updates" into oc-dev