Merge "SF: Rename HwcConfigIndexType to DisplayModeId"