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