Merge "wifi-display: add support for metadata mode on encoder output"