Merge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev