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

Change-Id: I4a809fcbf3b305e27c6e821a89649adf9f838c27