Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev