Merge "Revert "Fix the starting window could not be removed."" into rvc-dev am: 3c1b83c3bb

Change-Id: I7b26bd7eff01c654f3cccc1e1301a5c30ba6f38d