am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev

* commit '69dc952dba40c2c5ab3f0e596391e330ff9f71c8':
  Fix AM/PM text i18n and clean up keyboard support in time picker