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