Merge "[Ravenwood] Faster framework-minus-apex processing" into main