Merge "Update the KeyMint version to 3"