Merge "Using LaunchActivity when possible" into sc-v2-dev