Merge "Add intDefMapping to winscope." into main