Merge "Remove secondary bidi cursor"