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

Change-Id: I2aff7a18ab48964c132778413c3af2483c1f517f