Fix NPE when trying to add starting window

Container may already have been removed, so protect against that
situation.

Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes: 34227241
1 file changed