Merge "Fix inconsistency in user activity types." into jb-mr1-dev