Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev