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