Merge "[WindowManagerService] fix starting window issue"