[DO NOT MERGE] Remove toast window immediately am: 6367e4ed30
am: 0c3d70a1f4

Change-Id: I1cf4a84bc02c2f5274c1aa7d0015f77e5dc89a69