Merge "Don't run expand/collapse animations when dismissing." into nyc-mr1-dev
am: 2af6932ae8

Change-Id: I93c0e294c8a4e0e4c151da68be5c8e66201f1724