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

This reverts commit f3504d69fbee0f69a1be533307dd2e2f333347c8.