Merge "Add explicit completion condition for Direct Share"