Merge "Use correct window token for scrolling screenshots" into sc-dev