Merge "Fix NPE when trying to add starting window"