Merge "Fix Overlapping notifications when the swiping out is canceled" into main