Merge "Work folder name is only fetched from activity, not ActivityContext"