Merge "Fix incorrect escaping of nested <em>, <strong>, <q>, <ruby>, and <bdo>"