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

Change-Id: Iee7012bacfd55990d8d097e487d6dd10bfe60370