Merge "wfd sink update."