Merge "Fix GATT client leakage when scan is throttled (1/2)"