Merge "Fix bug #5438102 Double Arabic harakat overlap instead of stack In TextView"