Merge "Merge "Prevent dismissing starting window when reopening app" into qt-dev am: 94f7f39a am: 95376bb8" into qt-r1-dev-plus-aosp