Merge "Introduce WindowToken Builder" into sc-dev