Merge "Merge "Reland "Prevent dismissing starting window when reopening app"" into qt-dev am: 61a87812 am: 37784f75" into qt-r1-dev-plus-aosp