Merge "Rename system property to enable KeyMint VM" into main