Merge "Move DeferredStringifier into libs, add tests"