Merge "Update framework tethering UI"