Merge pull request #7666 from jordan-woyak/input-shutdown-fix ControllerInterface: Shutdown order and race condition fix.
