Merge "Preventing from double remove starting window after Activity destoryed" into udc-dev