Merge "Fix for Blink in TextView."