Merge "Prepare comments and annotations for OverlayManager public API"