Merge "[DO NOT MERGE] Move code to fix studio build" into sc-dev