Merge "Check if notification group child is bundled and regroup when posted" into main