Merge pull request #4302
8969828 [Qt] New status bar Unit Display Control and related changes. (gubatron)