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