Fix client headers to return same cell for all merged columns (#13334)

Change-Id: Idad11b8d7a4b6e78e061c15863b99339c317f6f1