Merge "Enforce same package name when connecting to widget service" into main