Merge "Soft deprecate DeferredStringifier class"