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

Change-Id: I60b9a278b901ea90a715f5d3a7ca72e03a913c6a