Merge "Fix bug #8115437 Need to remove ArabicShaping from Framework"