Try to fix null window errors when hangling home action

Change-Id: I6b5cd4010fd619cbc9c1294d76d74b82f61f7839