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