Merge "Add reset() and setEnabled() to MultiStateCounter"