Merge "Improvements to multi select toasts"