Remember cursor position on cell type change
Merge pull request #5941 from jdfreder/i5688

Remember cursor position on cell type change