Merge "Create test for screenshots with null snapshots" into main