Merge "Fix connection time for GATT clients"