Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev