Merge "composer: Add lock for callback functions" into rvc-d1-dev