Merge "Remove onPreDrawListeners earlier in TextView"