Merge proposals dependent on lp://staging/~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions

1. 944060-tracking-user-actions
2. Dependent merge proposals