Merge "Add CustomizationPickerActivity2 to TP Manifest" into main