Merge "Move and rename user activity event type constants." into jb-mr1-dev