Merge "Initialize the DIS client before requesting DIS UUIDs from peer"