Conflict in examples/companion_radio/ui-new/UITask.cpp: upstream replaced UI_SHOW_CLOCK with the runtime pref ui_show_clock; kept that and our BLE pin condition (shown only while Bluetooth is enabled). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>