Merge "Improve Toast usage"