Merge "Revert^2 "Run module code only after KeyMints receive module info"" into main