Merge "Make ConstraintLayout the root of the VolumeDialog" into main