Merge "Fix tethering summary when airplane mode is off" into pi-dev