Merge "Use getLaunchedFromPackage instead of getCallingPackage" into main