Merge "Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am: e0d3ce875f am: f15ba1b50c" into qt-r1-dev-plus-aosp
am: 23c84407e6

Change-Id: Ie54af2598ea219c05b0801a33ebd0ebb68b9c44a