Merge "SF: Remove forced transaction on screenshot" into nyc-dev