Merge "Fix weird race condition in BT manager"