Merge "Workaround for sysui studio builds" into sc-dev