Merge "Fix screen on count text dump" into pi-dev