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