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

* commit '87b86a2d5418e23f858393f1f074f07a06e9b981':
  Don't dismiss volume during animation