Merge "Fix bug #4338103 (Android Arabic and Hebrew input is broken)"