Merge "Extract alert handling into NotificationAttentionHelper" into main