Merge "Switch the order of calls in setStreamVolume" into main