Merge "Revert "RRO: Update target overlays after install"" into pi-dev