Merge "config: Clean-up HDR flags"