Merge "Fix flaky test for VolumeDialogImplTest." into main