Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev