Merge "Added windowToken to WindowInfo object" into sc-v2-dev