Merge "Fix NPE in Wi-Fi Direct Setting UI"