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

Change-Id: Ic4fb7ec7be661be767bcff3820a14c4315cac007