Merge "Transfer starting windows more aggressively" into pi-dev
am: fd181dc69e

Change-Id: Iadf5cb0fc2b188be5786118c9e6f9963b38825f6