Merge "Add cmd to reset default component enabled setting"