Merge "Fix BiDi issues in app error dialogs" into nyc-dev