Merge "Revert "Don't re-animate dialog dismissal" Fixes: 112577631"