Merge pull request #5418 from MerryMage/config-again-and-again VideoConfig: Port to layered configuration system
