Merge "Fix non-blocking playback threads creation"