Merge "Do not collect WindowState when moving to a different display" into main