Merge "Fix redundant drawPath call"