Merge "Remove addWindowTokenWithOptions" into sc-dev