Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into main