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