Merge "Refactor content fetch condition in ApiQueryRevisionsBase"