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