Merge "Update number picker styling for Material" into mnc-dev