In preparation for other things driving the UserActivity.
Created attachment 243378 [details] Fix
Created attachment 243379 [details] Fix
Comment on attachment 243379 [details] Fix r=me
Committed revision 177385.