Merge "Remove overdraw counter"