Merge "Cleanup user data when user stopped"