Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aa am: df459cb2 Change-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad