Merge "Fix current connected device not update" into rvc-dev