Merge "Fix TimePickerDialog positive button clicks." into oc-dev