Merge "Fix date and time picker styling" into lmp-dev