Merge "Use new OverlayManager categories"