Merge "Fix sysui studio build" into udc-dev