Merge "Prime cache for tone mappers in mediaserver"