Address review feedback for Connect via Bluetooth UI

1 job for !1398 with 1961-connect-via-bt-ui
latest merge request