Fix Merge Conflicts

Author: PureWeen

src/Controls/tests/TestCases.HostApp/FeatureMatrix/DatePicker/DatePickerControlPage.xaml.cs

@@ -71,14 +71,14 @@ private void ReinitializeDatePicker()
 		{
 			if (e.PropertyName == nameof(DatePicker.Date))
 			{
-				DisplayCultureSpecificDate(datePickerControl.Date, _viewModel.Culture);
+				DisplayCultureSpecificDate(datePickerControl.Date ?? DateTime.Now, _viewModel.Culture);
 			}
 		};
 		_viewModel.PropertyChanged += (s, e) =>
 		{
 			if (e.PropertyName == nameof(DatePickerViewModel.Culture))
 			{
-				DisplayCultureSpecificDate(datePickerControl.Date, _viewModel.Culture);
+				DisplayCultureSpecificDate(datePickerControl.Date ?? DateTime.Now, _viewModel.Culture);
 			}
 		};
 
@@ -103,7 +103,7 @@ private void DisplayCultureSpecificDate(DateTime date, CultureInfo culture)
 
 	public void OnDateSelected(object sender, DateChangedEventArgs e)
 	{
-		if (e.OldDate.Date != DateTime.Now.Date && e.NewDate != e.OldDate)
+		if (e.OldDate.Value.Date != DateTime.Now.Date && e.NewDate != e.OldDate)
 		{
 			OldDateSelectedLabel.Text = e.OldDate.ToString();
 			NewDateSelectedLabel.Text = e.NewDate.ToString();

src/Controls/tests/TestCases.HostApp/FeatureMatrix/TimePicker/TimePickerControlPage.xaml.cs

@@ -70,14 +70,14 @@ private void ReInitializeTimePicker()
 		{
 			if (e.PropertyName == nameof(TimePicker.Time))
 			{
-				DisplayCultureSpecificTime(timePicker.Time, _viewModel.Culture);
+				DisplayCultureSpecificTime(timePicker.Time ?? TimeSpan.Zero, _viewModel.Culture);
 			}
 		};
 		_viewModel.PropertyChanged += (s, e) =>
 		{
 			if (e.PropertyName == nameof(TimePickerViewModel.Culture))
 			{
-				DisplayCultureSpecificTime(timePicker.Time, _viewModel.Culture);
+				DisplayCultureSpecificTime(timePicker.Time ?? TimeSpan.Zero, _viewModel.Culture);
 			}
 		};