Merge "Content Capture change to send window token on creating session." into sc-v2-dev