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