Merge "Fix not able to launch activity adjacently" into sc-v2-dev