Merge "Revert "Undo NAN periodic ranging changes in the"" into main