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

Change-Id: I73db4793b09c095404e61e7b377579108116c5f2