Merge "Other improvements to text cursor movement." into gingerbread