Don't set line-height of unset button labels

Bug: T78326
Change-Id: I30637b2df635b386877d26fed8b51acbfdae8f9f
Merge "Don't set line-height of unset button labels"