Merge "Fix dismissing activity getting relaunch signal while dismissing split" into sc-v2-dev