Merge "Fix TetherSettingsTest" into rvc-dev