Merge proposals dependent on lp://qastaging/~osomon/moovida/make_cancellable

lp://qastaging/~osomon/moovida/make_cancellable has no merge proposals.