Merge "Moved the Bluetooth-related default config init within onCreate()"