Merge "Fixes date and time picker to use integer values" into cw-f-dev