Merge "Add dependency on libui-types"