Merge "msm: ipa3: Prevent addition of duplicate headers"