Revert "Revert "Avoid layout passes when updating data activity indicators.""

This reverts commit 1cf152da665e117ad49a90f9b165ec7b5937c519.