Merge "Add TV flag config" into main