Merge "Always invalidate TextView on checkForRelayout"