Issue 18394: Separated picker and picker widget into two kinds.