Merge "Promote "overlapping notifications" fixes to teamfood" into main