Fix tests related to setting current time when pressing Today button
Merge branch 'add-timepicker'