Merge "h/q/d: Drop layers from composition on NULL ROI."