Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am: e0d3ce875f am: df5ed2e842
am: 1a3ed41447

Change-Id: I25ba63b0626a83403fed4055427f62d6a85c958c