sdrplay2: Which changes to merge?