Merge "Enable Gratuitous Neighbor Discovery feature by default." into main