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

Change-Id: Ia45a6ba72cc9205191054107e0baaa12c6c9b4bd