Merge "Updating numberpicker assets" into ics-mr0