am 4c200997: Merge "Fix date and time picker styling" into lmp-dev

* commit '4c2009971702645175ad33de5c61fe42a8206aef':
  Fix date and time picker styling