Merge "Reland "Prevent dismissing starting window when reopening app"" into qt-dev am: 61a878126c
am: 37784f75a7

Change-Id: Ib36bc9b7721f1709c2b8f74542eccc8c497f5f9f