Merge "Move UMS.markEphemeralUsersForRemoval earlier in the boot." into main