Merge "Fix toggling of AM/PM of TimePicker using hardware keyboard."