Merge "DisplayModeDirector: simplify access to DisplayDeviceConfig" into main