Merge "Also await IpClient's shutdown" into pi-dev