Merge "Ensure correct installer name is shown in UpdateOwnership dialog" into main