Merge "Avoid calling invalidateSelf() from draw call"