Merge "Fix the starting window could not be removed." into rvc-dev