am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev

* commit '46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba':
  Don't dismiss volume during animation