1925: Fixes issue
Merge branch 'staging' into i-1925
1925: Hacks to fix dashboard/assigning tasks issue. Sorry

Since our assigning task is already a hack,
we need another so when the user already has
max number of tasks for a team, we don't have error
when the user tries to resume a task.
Merge branch 'staging' into i-1925
Merge branch 'staging' into i-1925