Saudi envoy to Qatar takes up post as rift eases