Merge "Fix unsupported api usage in NumberPicker"