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