Merge "Don't re-animate dialog dismissal"