Merge "Add SIMULTANEOUS_CALLING to IntDef" into main