Merge "Attribute manual zen mode in volume panel footer." into nyc-mr1-dev