Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev