Merge "Clean up duplicate shadow lengths in layer snapshot" into main