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

Change-Id: Ic4705635042814d1efc187d05fad59d2c644e8ff