Merge "Switch to active BT route when changing focus" into pi-dev