Merge "Update SharedPreference values based on tethering state" into rvc-dev