Merge "[piav2] Ensure correct originatingUid is set while installing" into main