Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36" into nyc-mr2-dev-plus-aosp