Merge "Make tether settings intent explicit" into rvc-dev