Merge "Improve DatePicker focus for keyboards."