Merge "service: Solve locking issues inside GATT interface"