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