Merge "Move non-ui bt settings code to SettingsLib"