Merge "Don't re-animate volume dialog dismissal"