Merge "Support package name in market intent" into main