Merge "Include display ID in user activity reporting" into sc-dev