Merge "Make tether settings intent explicit"