Merge "Make OverlayablePolicy as enum type"