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