Merge "Add a new config_HsumBootStrategy to control the boot strategy in Headless System User Mode (HSUM)" into main