Merge "Add unit tests for ChangeTags::modifyDisplayQuery()"