Merge "Fix starting window stuck because of the remove status." into udc-qpr-dev