Merge "Moving text cursor to nodpi" into ics-mr0