Merge "Add config.xml fallback in DisplayDeviceConfig"