Merge "DO NOT MERGE Fix bug in getCurrentLocation cancellation" into rvc-qpr-dev