Merge "[Ravenwood] Enable PFD.getStatSize and cleanup implementation" into main