Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev