Merge "Add overlayable.xml to define customization scope"