Merge "Disable state save/restore for inflated date/time picker views" into oc-dev