Merge "Revert "Adding configurable default behavior for Enabling Modem ..."" into main