Merge "Make selected PIC caches non-isolating" into main