Merge "keystore2: add more logging" into main