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

Change-Id: Ib6025a6e1ffe29c60e7d147bff4cc0aa9491752b