Merge "Status bar updates" into oc-dev
am: c5e04dbfd4

Change-Id: I34324fbaddc90814bc4efdd2d723c4b7264d284a