Merge "Improve toast text." into main