Merge "Prevent gps stuck on if multiple starts are called" into oc-dr1-dev