Merge "Don't truncate empty text on low density" into pi-dev