Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev