Merge "Create a DisableInfo object instead of exposing DISABLE_* flags"