Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
am: 332762aaf0

Change-Id: I20cc197cc2f1d4d9dd0b6b6c6fee07e71dd4a1d3