Merge "Fix TimePicker crash on rotation." into oc-dev