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

Change-Id: I75ea0ca3cbdb8ef6c244a11d3812b4e4925b584d