Merge "Add targetOverlayableName to OverlayInfo"