Merge "Add an on-screen overdraw counter"