Merge "Fix some issues with studio build" into sc-v2-dev