Merge "Prevent displaying duplicated guest notifications." into main