Merge "fix up new text address handling in page content dumps"