Merge "Use removeActiveDevice() when set phone as active device"