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

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