Merge "Fix for the cursor position with the arabic script." into devel/master