Merge "Avoid replacing receivers with ones from the same BroadcastRecord." into main