Merge "sdm: HWDevice: Set correct HWDisplayMode" into dev-1.0