Merge "Mitigate LSKF leaks in RecoverableKeyStoreManager" into main