[DO NOT MERGE] Prevent crash from early Toast surface destruction.
am: 0bfaa461c6

Change-Id: I78c60bbb725cb3ea694f090e4f493c7a8247a41b