Merge "Stop disabling the HiddenTypeParameter check" into main