Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
am: 24370bfd30

Change-Id: Ic3e25e78d3916f8939cca1ca7b449787e788fde8