Merge "Use a SC wrapper when running on background thread" into sc-v2-dev