Merge "Adding back screenshot test to Settings." into main