Merge "Log before stopping/removing the current client" into pi-dev