Merge "Avoid losing cached ParserOutput in doEditContent."