[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8c am: a7ff8fbe am: f5111345 am: aa493da3 -s ours Change-Id: I9ab1c8e918fa37732e439001554cf4217a69c63f