Merge "Add a new boot strategy for headless system user mode" into main