Merge "Codec2: change C2ComponentStore::query to sm (may block briefly)"