Merge "Fix recomputeMediaTypeValues to accumulate all updates and update later"