Merge "Work on sysui dependencies"