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