Merge "Fixes crash (race cond) when using toast that is immediately cancelled"...
Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev am: 2df0155a
am: c4996bd8
Change-Id: I6ab834ef0b291e24cdc67b885bcd5c6230a82cb1