Merge "Simplify Zen mode voice activity." into mnc-dev