[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36
am: 629cf8c948 -s ours
Change-Id: I5fb6b82390253044ef349b0f140b095da4634a5e
This commit is contained in: