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

Change-Id: If91d9bd5aa69ba752cafaafbea9330754492ebe8