Merge "[Catalyst] Bluetooth screen migration" into main