Merge "Discard cache-automerge/* refs early in VisibleRefFilter." into stable-2.5