Merge "Revert "Enhanced MAC randomization feature default enabled"" into sc-dev