Merge "Refactor ChangesCollection to be injectable" into stable-2.8