Merge "Add killing all user processing prior to removing the user"