Merge "Fix starting window memory leak"