Merge "Add overlay management functions into OverlayManager"