Merge "Tethering: ignore duplicate upstream changed event"