Merge "Separate advertiser from GATT client (3/4)"