Merge "SF: Change screenshot code to use snapshots"