Merge "Fix bug in getCurrentLocation cancellation"