Merge "TimePickerDialog OTG keyboard entry discarded"