Merge "OverlayProperty API implementation"