Merge "[automerger skipped] Re-enable UFFD GC for the February train, but with a different flag. am: c1f2365928 -s ours"