Merge "Fixing issue where we were adding text to each scroll event. (Bug: 5328362)"