Merge "Merge "Revert "Prevent dismissing starting window when reopening app"" into qt-dev am: 4cd89f0332 am: 5a898bb75f" into qt-r1-dev-plus-aosp
am: b021d9c890

Change-Id: I17a8f4c494027909f62a037065e3ea81ab39bdbc