Merge "Only set text when it actually changes" into pi-dev