Merge "fixing the location api level race condition on callbacks" into pi-dev