Fix reset state before killing window bug.

Only seemed to show up on jetson build...weird.