Merge "Dump OverlayProperties" into main