Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv..."" into main