Merge "Avoid over logging preference changes."