Merge "Report mApp.uid instead of mApp.info.uid." into main