Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev