Merge pull request #8616 from jordan-woyak/threshold-cleanup InputCommon: Eliminate some duplicated button threshold logic.
