Merge "Merge "Reland "Prevent dismissing starting window when reopening app"" into qt-dev am: 61a878126c am: 37784f75a7" into qt-r1-dev-plus-aosp
am: 823a5388d2

Change-Id: I9d76ded110eb304211756ce1a5253dde4a0e77f1