Merge "Remove unused back overlay packages" into main