Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev