Merge "Remove legacy memory trim code" into main