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

Change-Id: If44971e053525d28128d1ab40722e1b077536566