Merge "Remove circular depdendency in VolumdDialogControllerImpl."