Merge "Update AssistDisclosure animation" into nyc-mr1-dev