am 9ce1ea3a: Merge "Fix starting window problems." into jb-dev

* commit '9ce1ea3aa744fdd5a63ecedd07859fb2faa6f8e1':
  Fix starting window problems.