Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev