Merge "Do not create starting window if app window isDrawn." into main