Merge "Transfer starting windows more aggressively" into pi-dev