Merge "wfd: create new API to get the R2 device type" into sc-dev