Merge "Fix race condition when doing GATT discovery"