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