Merge "Fix merge for OnDrawListener"