Merge "Fix bug #5979311 Change TextView to not clip top/bottom text"