Merge "Fix ConcurrentModificationException from LocationController" into oc-dev