Merge "Fix swipe cancel lifetime extended notifs" into main