Merge "Fixed a few issues with starting windows" into qt-dev