Merge "HDR: Add HDR type to DisplayConfiguration" into main