Merge "Strip part of the activity info of another uid if no privilege" into tm-qpr-dev