Merge "populateContentModel: Invalidate content model and revision cache"