[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 0bfaa461c6
am: 948eb32664  -s ours

Change-Id: I0be6bfecfbd2c9b4e0c5db8f577dc503bbbbeb57