After adding NetworkActivityIndicator support