Merge "ShutdownThread: Don't wait for Bluetooth"