Merge "Remove wifidirect UI listing" into ics-mr0