Merge "Fix bidi desired width calculation"