Merge commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9' * commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9': jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9' * commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9': jni: GpsLocationProvider: Check for pending callbacks before waiting