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

Change-Id: Id807f996d1353340183b73d9e6a5d584cc319028