Merge "Revert "Updated screenshot code to reflect native changes.""