Merge "Revert "Prevent dismissing starting window when reopening app"" into qt-dev