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