Merge branch 'topic/snd-device' into for-next