Merge "Move the last user save from onCleanupUser to onStopUser" into oc-dev