Merge "Separate LE scanner from GATT client (3/4)"