Merge "Revert "Enable flag to remove static list in trunk_staging"" into main