Merge "Revert "Revert "SF: Add support for screen captures"""