merge: reconcile the pre-restack branch history

The branch was rebased onto latest main, dropping the commits that landed
separately as #4070. This merge keeps the rebased tree and records the
superseded history so the branch fast-forwards on the remote.

Author: haiyuechen-nearone