Merge "Make warning about deprecated SlotDiffRenderer wrapper less noisy"