Merge "Prioritize system toasts" into sc-dev