Merge "Add log statement for double-removal attempt on overlay" into main