Merge "[WindowManagerService] fix starting window issue" am: 8683f1b160
am: a7582b55e7  -s ours

* commit 'a7582b55e789f76fa18364950a93193ba7c0b2dd':
  [WindowManagerService] fix starting window issue