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

Change-Id: Id672b82ddba7aee6e3c2748a7fae1e9f879538aa