Merge "More threading issues fixed in audio effect tests" into jb-dev