Merge "Configuration#isScreenHdr should depend on hasHdrDisplay"