Fix text being cut off at the bottom of inline buttons

E.g. letter g, y, etc.

Change-Id: I2614e583ae2c4177f5be70e7c1be6f7019a198d1
Merge "Fix text being cut off at the bottom of inline buttons"