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

Change-Id: I9a6c1bf3d8023ab1d0db442605b9c8bc7b9b5a3f