Merge pull request #16517 from coolljt0725/show_help_all_the_time

Clean up: show usage when global --help present