Merge "Enforce simultaneous calling accounts have the same package name" into main