Merge "Simplify CursorAnchorInfoCompatWrapper"