Merge "Prioritize system toasts" into tm-dev