Merge "Use getRunAdvance to position cursor" into mnc-dev