Finish making InputControl
et al. more controllable
#40568
Merged
InputControl
et al. more controllable
#40568