Merge "Use removeActiveDevice() when set phone as active device" into rvc-dev