Merge "Remove unused VolumeController."