Merge "Fix no intent extras on CustomizationPickerActivity" into tm-dev