Merge "Added primaryUserOnly attribute for activities"