Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aa am: df459cb2 am: 70c0f5c2" into nyc-mr2-dev-plus-aosp