Merge "p2p: only test WFD R2 API in S or newer" into sc-dev