Merge "[DO NOT MERGE] Remove toast window immediately" into nyc-mr1-dev am: 821dd78512
am: 35fd4373b2

Change-Id: Idfc0c78dbd847afa1b87fdc5ed1ea71bc114ae09