Merge "Revert "Prime cache for tone mappers in mediaserver""