Merge "Ensure that filtered notifications are removed from BadgeInfo." into ub-launcher3-master