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

Change-Id: I9c30ec82bab149805891157df27bd4f66a5aff6c