Merge "Update date and time picker headers for dark theme"