Upstream e1c972b681bf118fcedb9fe2ed7a73de983aa5ef makes it depend on UIDGID_CONVERTED which is only set when all of the subsystems have been converted to be user namespace safe. That defaults to Y whenever it happens, so we'll set this after that point.