Merge "Prioritize system toasts" into main