Merge "Fix location status bar icon" into oc-dev