Merge "refactor(versal): move payload and module ID macros" into integration