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

Change-Id: Id3f66ab179421f6ff0d85128b06c5acf82209b11