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

Change-Id: I1680f8f61791aed33173fe1c954a90f4d5d3326c