Merge "Revert "Prevent dismissing starting window when reopening app"" into qt-dev
am: 4cd89f0332

Change-Id: I390155862eaf764ae49e7393b67d2a55050a69e0