Merge proposals dependent on lp://qastaging/~ucl-cs-study-devs/activityfinder/ucl-multitasking-study

1. ucl-multitasking-study
2. Dependent merge proposals