Merge "Fix deadlock for system location clients" into rvc-dev