Merge "Clean up date picker, add simple constructors and setter for listener"