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

Change-Id: I21a297a817cc3494a585675b666634f4519dd6a1