Revert "Fix the starting window could not be removed."

This reverts commit e5cad56d4e642b4789160a3bcabba92ea82b3f26.

Reason for revert: b/156746781

Change-Id: Ib5134cc1ee1382053d193b33769634b5ad11a0bb
Bug: 156746781
3 files changed