Merge "wifi-display: add a global setting to force WPS config method" into klp-dev