Merge changes from topics "sf_task_id", "sf_metadata"

* changes:
  Add task-id to the task-level surface
  Add metadata store to surfaces