Merge "OverlayManager API fixes"