Merge "Add default modules for system_ext and product" into main