Merge "Cutout emulation: string changes" into pi-dev