Merge "Ensure share server is created when driver handles share servers"