Merge "Resolve multiple BT device switching and active device updates" into main