Merge "Invalidate text display list on scroll"