Merge "Change screenshot test to use RNG" into main