Merge "Bug 3191746. atePicker TimePicker: Dark theme is used in a Light theme app"