[DO NOT MERGE] Prevent crash from early Toast surface destruction.
am: 016c9c8cb5

Change-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463