Merge "Hiding data remaining text when available space is too small." into pi-dev