Merge "Add logging of user stop and user removal events." into tm-dev