More typography updates from Moiz and Kaity (beta only)

Change-Id: I2cad4ce3d7af09fba52d87a32518715029eb32a0