Merge "Update toast parameters instead of re-adding" into sc-dev