Merge "Catch a missed case when adding a toast"