Merge "Prevent NotificationSwipeHelper from retaining notification"