Merge "Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am: e0d3ce87 am: f15ba1b5" into qt-r1-dev-plus-aosp