Fix upstream merge conflict on 169d3032d722
Merging upstream commit 169d3032d722 gives a conflict.
A human being has to perform merge and resolution for the automatic merge process to resume.
Command for clean conflict reproduction:
hg pull
hg --config command.update.check=abort update 1a3e5e87cc692f2b0c9e4fc8a3d484d0d3f4cb3d && \
hg topic upstream-merge && \
hg merge 169d3032d722469181abddc08cccc55ef26b1af3