master
8285285: Avoid redundant allocations in WindowsPreferences
8187443: Forest Consolidation: Move files to unified layout