Merge "Fix in Wifi activity updates" into pi-dev