Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev