Merge "Keep lock while binding the storage service" into rvc-dev