Merge "Numberpicker section divider is now 2dp thick" into ics-mr1