Merge "Fix tile text display for large font/display sizes" into pi-dev am: 58b47f3d53
am: 847e5a30a6

Change-Id: Ic197ef8a1dc5a5cafa0b1c4baab8d51b16f2656e