Merge "Cleanup TextView and Editor style issues."