Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev