Merge "Adding more biometric screenshot tests" into main