Merge "msm: ultrasound: support multiple devices, conflicting with USF"