Merge "Don't dismiss volume during animation" into mnc-dev