Merge "soundwire: Fix swr device count logic in registration"