Merge "Fixed threading issue in LocationControllerImpl" into rvc-dev