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

Change-Id: I9c1bb574a27d97a01b231e2909cddb5cb9eae47b