Merge "Apply deferred state correctly to newly replaced bcasts." into main