Merge "Persisting setDeviceVolumeBehavior calls" into rvc-dev