Merge "Fix regression in recent task list replacement" into pi-dev