* commit 'ba7bc591018c7a8a7f5c123f71161b69652f9bde': Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height
* commit 'ba7bc591018c7a8a7f5c123f71161b69652f9bde': Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height