Merge "Make DatePicker rendering not fail." into mnc-dev