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

Change-Id: I0254b84dac2b1cb3fa7a07e74218bf8cc30ff59b