Merge "Reland "Prevent dismissing starting window when reopening app"" into qt-dev am: 61a87812 am: 81de14de am: c10066b4 Change-Id: Ib6025a6e1ffe29c60e7d147bff4cc0aa9491752b