am 5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0

* commit '5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
  DatePicker crashes when going from 2036 to 2035 via ▼