Merge "Prevent crashes when user is stopping" into oc-dev