Merge "Add, standardise or temporarily opt out of safety comments for keystore2." into main