Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8
am: c8131c1e58

Change-Id: I35103df353bf82d27dec8a579f459ec1201247cd