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