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