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