Merge "Fix DisplayDeviceConfig crash for values > 255" into sc-qpr1-dev