Merge "wifi-display: add certification options" into klp-dev