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

Change-Id: Ic372436ee48a9f725c178a72c057a2192aad9267