[automerger skipped] Merge "Hiding data remaining text when available space is too small." into pi-dev am: 5f6937dd88
am: 7b0651b63f  -s ours

Change-Id: I51d36b9a8248a2c1047ddd6854d7c6675057c219