Merge "Fix a regression in BNC search previous activity inside task." into main