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