Merge "Update setHdrConversionStrategy to return the preferredHdrOutput type"