Merge "Fix SpaLib build after Compose 1.3.0"