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

Change-Id: I259dac4b2cb2080286cbbb19ffb45284f6ef04a2