Merge "Close databases in onStop user" into oc-dev