Handle the case where window position comes before view map

Test: Tested this change with a device with http://go/ag/1451804 to
make sure the new protocol was understood.

Change-Id: I9c42cfeb27951ae66a77386d0644d84c230a4923