Line breaks are respected and text no longer overlaps secondary icons

Bug: 16358219
Bug: 16488737
Change-Id: Iaa04d6bbb5a3e4544514ec5ed264c693711ec422
1 file changed