Merge "Decouple Tethering UI with registering of SDP records."