Combined activity and typing indicators
Fixed conflict