Merge "Fix tile text display for large font/display sizes" into pi-dev