Merge "Bug 1112: Update toaster to use async best practices"