Merge "Partial fix for bug 6132077 (incorrect line breaking of Arabic text)."