Merge "Make QS use SettingsLib's BT code"