Merge "Remove DisplayDeviceConfig null checks" into sc-dev