Store intended table selection before expansion and use when translating

This makes cursoring through merged cells more logical without
breaking the expectation that selections always cover merged cells.

Change-Id: I28dccfde5e02d44871f1828154faccd33d8332cb
Merge "Store intended table selection before expansion and use when translating"