Merge "Sandbox changes for use in UXR prototype." into sc-dev