Merge "Updated Contacts due to refactoring in NumberPicker for exposing the latter in the SDK"