Fix Wi-Fi Display

Change-Id: I2679be5301563f13fd098ed92c1babb123933355
Merge "Fix Wi-Fi Display" into kitkat