Merge pull request #8617 from jordan-woyak/control-creation-cleanup InputCommon: Clean up creation of inputs.
