Merge "Replace system_ext container with system" into main