Merge "Revert "Fix sysui studio build"" into udc-dev