Merge "Fix losing status bar icons on config changes" into oc-dev
am: f244f7e1b8

Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9