Merge "[Mac Randomization] Fix perference changing not work and wrong default value"