Merge "Enforce overlayable API when defined"