Merge "rename callingPackageResourceId to resourceIdInCallingPackage" into tm-dev