Merge "Fix the starting window could not be removed." into rvc-dev am: 3443ba8dc9

Change-Id: I57ea7622aa23a6c691b711c31ee778f8b9f2a413