Merge "Make ImageView drawable update more efficient in some cases." into cm-11.0
Merge "Avoid layout passes when updating data activity indicators." into cm-11.0