Merge "Rename DesiredDisplayModeSpecs.defaultModeId to baseModeId"