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