Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev