Merge "OverlayManager: Add categories"