Merge "Fix bug 2564450 - prevent deadlock in BT settings" into froyo