Merge "Fix stuck exiting windows" into pi-dev
am: 65e2dda7f8

Change-Id: I95646a8488a7b08d79275b611196bafddd77fddb