[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: f5111345d2
am: aa493da365  -s ours

Change-Id: I9ab1c8e918fa37732e439001554cf4217a69c63f