am 7f3a53a4: am 7b69e401: Merge "Fix starting window memory leak"

* commit '7f3a53a447d40db36f8f0c2b4c8c7305c5dd4429':
  Fix starting window memory leak