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

* commit 'cd8b462ec4cfc2652346dc3dc8eba3858f9b7c28':
  Don't dismiss volume during animation