Merge "Don't show animation on dialog close." into main