Merge "p2p: p2p_go_ht40 won't take effect" into pi-dev