Merge "Prevent duplicate devices from getting registered" into sc-dev