Merge "Removing TextView predraw listeners sooner"