Revert "Merge "Avoid layout passes when updating data activity indicators." into cm-11.0"

This reverts commit 230b011702a15160330d090ff0581aa5d619540c.