Fix npe in detachFromWindow

Bug: 142637464
Test: all tests should pass
Change-Id: Ic3c3347886d4a7e454ab1e49b9135a27e8f5596b
(cherry picked from commit a838271299275ad0db9ec45247befc6c7949b59a)
1 file changed