Merge "Revert "Activate KeyMint."" into sc-dev