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

Change-Id: I0b9eb29e8d2425bce67024514bca116d5e3e94ee