Merge "Add flag for scrolling screenshots"