Merge "Resolve NumberPicker display abnormal issue."