Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am: e0d3ce87 am: f15ba1b5 Change-Id: I9d0e5b7df94241ec5c8d4b511a086c61448d796a