Merge "Follow up to TextView's baseline is correctly computed for empty text"