Merge "Add preference click metric logs for some special cases"