Merge "Remove screenshot_fd as optional param"