Merge "Adding HDR10+ metadata support for media API"