Merge "RRO: Don't update overlays when target changes" into pi-dev