Merge "Replace explicit intent with implicit ACTION_TETHER_SETTINGS intent"