Merge "Don't wait for Bluetooth when shutting down"