Merge "Fix deadlock in tuner callback adapter" into main