Merge "Updated system settings to control BLE scanning"