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

* commit 'a6b8189f8e152caafe5900cff0f068517a70088d':
  Fix starting window problems.