am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev

* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
  Fix DatePicker rendering.