Merge "Fix screen on count text dump" into pi-dev am: dd61c7e8e7
am: 7351e73b96

Change-Id: Ia2c306193de81a311950e1770a9b0d0e865ac8f7