Merge "Fix slow dismiss animation" into nyc-dev