Sweeping !5326 from 21.0 to master. Adjusting photon pT threshold obo Chris Young as discussed in… See merge request !5787 Former-commit-id: 486086dc