Merge commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4' into kraken * commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4': Fix bug 2564450 - prevent deadlock in BT settings
Merge commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4' into kraken * commit 'bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4': Fix bug 2564450 - prevent deadlock in BT settings