Merge "[Bootstrap Activation] Avoid Data Roaming On/Off Popup at bootstrap sim" into main