Merge "Add versioned libkeymint_support" into main