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

This reverts commit 9fff44537ad214fef68548226514600e464fcce0.