Merge "Ensure crypto self test result is logged" into main