Merge "Adding config flag for default behavior on Enabling Modem on Boot" into main