[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8c am: a7ff8fbe am: 631370fa am: 629cf8c9 -s ours Change-Id: I5fb6b82390253044ef349b0f140b095da4634a5e