Merge "Inject mocks in RemoteVolumeControllerTest via constructor" into main