Merge "Change UidDetail.packageName to String" into main