Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 1ee928a62a
am: 6d635c1960

Change-Id: I0766aefff761f7a79f9c78bdf57e46429132ceb7