Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev