Merge "Remove availability tests from RingVolumePreferenceControllerTest" into main