Merge "Avoid duplicate refreshCounts() updates"