Merge "Volume: Hide zen options during setup." into lmp-dev