Merge "Fixes for scrolling screenshot tests." into sc-dev