Merge "Revert "Enable settings_tether_all_in_one by default"" into rvc-dev