Merge to XFA: Fix issues with != and == in fx_basic_wstring