Merge "Update DisplayConfigs_test to use Modes for the tests" into main